Merged from dev into v1.55