BZ-12550 fixing messages and href
Merge branch 'PM2Way' into integration