Merge branch '2021-09-22-general-updates' into next

- Some sandbox improvements
- Make cleanups related to the overusage of the exact build time
  variable.