Merge changes from topic 'bug/4143'