merged from 3.11.1-beta-1