Merge "Use the credential req & callback set on view" into main