Merge branch 'MDL-68665-310-assign-stamp-cache' of https://github.com/jamie-catalyst...