Fixing NMS-6083: parent-foreign-source is not working anymore