12 Commits (fix-3578)