Phase 14 of authentication implementation - partial merged implementation