Merged the plugin related changes for TRINIDAD-61 already into a private branch;
6 files changed