12 Commits (fix-3534)