merged from 3.11.1