Code review feedback for redesign branch

Merge request reports