Merge branch 'master' into bug402721-rra