BZ-12492 fixed minot issues.
Merge remote-tracking branch 'origin/Sprint73-CP' into Sprint73-CP