Merge branch 'jn/less-reconfigure' into next