Merge "Don't throw but wtf to help chase mismatched start/finish op calls" into pi-dev