Merged development to trunk for v1.54 release