Merge "Fix splits class loader context for non dependant splits"