JC-1591 Plugins activation improvement