[Reviewer: Rob] Hss overload

Hi Rob, can you please review these changes for sto297?