Apply patch.
Merge branch 'patch-ordering' into blob-reorg