AUTO-496 fix warnings. refactor
Merge remote-tracking branch 'origin/auto496' into dev-cs