Merge "Revert the removal of FBE related checks." into rvc-dev