8 Commits (fix-3196)