Merge branch 'jn/merge-renormalize'