Merge branch 'rs/repack-without-loosening-promised-objects'