Merge "Mandatory Biometrics - Framework (3/N)" into main