Merge pull request #2253 from dunxen/2023-05-removeoptionalfield