[DF-4056] Review comments fixed
Merge branch 'to_master' into development