Merge "Unify post credential verification tasks"