WCM-1 reapply our changes to plugins SDK