Merge branch 'MDL-70120-assign-stamp-expires' of https://github.com/brendanheywood...