Merge pull request #4875 from Cynthia-0203/fix/unify-operation-log-username