WEB-3155 different button size between default and custom profiles
Merge branch 'FixesFor6.1.1' into CoreProduct