Merge "Improve dynamic cred log to include scope"