12 Commits (release-2.6.1)