CA-114341: assorted LVHD/GC fixes

This is a combination of all commits related to CA-114341.