Regards !422 (closed), per Sal's request, will cherry-pick the first commit of PolyObject crushing which applies the fix to waypoint polyobjs. A more thorough implementation can be explored later.