Merge branch 'master' into bug445203-rra