DF-4241 removed comment
Merge branch 'to_master' into development