Merge branch 'master' into bug104373-rra