Merge branch 'master' into bug23712-rra