Merge changes from topic 'bug332914'