Merge branch 'jc/dashless' (early part)