Back fixes to 5.0.1 CE for CloudSherpas