Incorporate HW6 fixes.
Add HW6 fixes
Merge branch 'develop' into staging