Merge "Update the comments for onAuthentication<...>" into sc-dev