MERGE Further manifest flushing fixes