Merge fixes to ?preload= from /branches/conrad/ (cf. bug 5210, r62864, r62035)