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
of course, fixed in f10d1277a5e795256a247cb6f130cefba12c5ffc