merged from v1.6.x