Merge pull request #2419 from jurvis/2023-03-interactivetxs