Merging (much needed but not yet working) empty section preservation branch into v1.65