first commit after fixes
Merge remote-tracking branch 'origin/HW'