DF-3938 fixed clone
[DF-3430] Changes after review.
Merge branch 'development' into feature-new-lighting