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