Merge "Delete unused RecoveryController exceptions" into pi-dev