Merge branch 'nd/narrow' (early part) into jc/add-i-t-a