Merge pull request #2871 from dunxen/2024-02-msgcommonfields