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