Merge pull request #17688 from artfulrobot/artfulrobot-trxn-id-and-date