r4001 Merged LiveCDP changes from maintenance-#3993