Merged from v1.3