Merge changes from topic 'bug/6023'