Bug 9988: Few subtle changes for postponed merge