New branch to merge

Merging commits
forgot this

original commit
Merge remote-tracking branch 'origin/merge_iteration2'