[DF-3266] some small safe fixes
Merge branch 'origin/development'