Merged from 8c12 on v1.55 into v1.60