[qtav/f25: 2/2] Merge branch 'master' into f25