Merge branch 'jc/post-simplify' (early part) into next