12 Commits (fix-3574)