Merged development into v1.55 in prep for an interim release