[4] MultiVendor Core modification