Merge "Set the stash handle bounds deterministically" into udc-qpr-dev