Obc failsafe

This is a *WIP* PR to track progress in bringing up failsafe behavior according to the OBC rules (and also improving general failsafe behavior)

includes #1205
Comment wrong :)