54560436 addendum (always call StopBuild)