Merge branch 'master' into bug504880-rra