Merge "Add biometrics to mapper." into main