12 Commits (fix-3339)