Merge "Remove face/fignerprint search if not present" into main