Merged branch 'master' into '431642'.