Merged development to v1.55 for release as v1.5508