12 Commits (fix-3342)