Merge pull request #1121 from TheBlueMatt/2021-10-return-temp-id