Merged from 1.147