BZ-10553 fixed minor issues.
Merge remote-tracking branch 'refs/remotes/origin/master'