7 Commits (feature-1.2-dev)