BZ-12825 fixed cancel link
Merge branch 'Sprint74-CP' into integration