BZ-11923 - fixed cancel button
Merge branch 'origin/master'