Merged from v1.55