Merge branch 'tb/add-renormalize'