Fixing the issues found in #9954
Merge branch 'master' of https://github.com/syslabcom/osha.hwccontent