Merged development into v1.55 for release as bump of v1.5508