Merge changes from team/russell/issue_9520