Fix normalize and some refactoring 馃す

Closes #3243749

Merge request reports

Loading