Commit for stable version: 3.1.9