[Reviewer: Rob] Sto552

Rob, can you review these changes for crest for sto552