Merge "Proper handling of unrecoverable status." into rvc-dev