[#74621012 & #75278492] make the plugin changes in the real plugin, not in the unneccesary code in the DC project