Merged development fixes to v1.55 for v1.5508 patch release