re-order and merge cont-flush patches
4 files changed