Merge branch 'master' into bug232448-rra