ONHP-97 -  Modify UI with disabled JavaScripts
Merge remote-tracking branch 'origin/engagepoint/dev' into engagepoint/dev