Merging v1.55 back into dev