Merge changes from topic 'BUG-4117'