Commits after rebase

Forgot to take care of merge comments