Commit in branch 2 (+1 squashed commits)

Squashed commits:

[95ea91f] Commit in branch 1
Squash commits