Merge changes from topic 'BUG-3774'