BZ-10553 fixes, tweak, refactoring
Merge remote-tracking branch 'refs/remotes/origin/master'