DP-127 Fixed issue with core on-demand