12 Commits (fix-3169)