Extra commits from v3.1-based master