[girl/f24: 2/2] Merge branch 'master' into f24