Credential rework final merge