Evil Merge branch 'jc/status' (early part) into js/diff-ni