Merge "Add mandatory_biometrics flag" into main