Merge remote-tracking branch 'origin/develop-HPD-40' into develop

Conflicts:
images/main_nav_bg.gif