Merge "Some minor refinements in CCSDK SLI Northbound"