Merged from 4.1.1