Refs #4745 & Refs #5137 reworks and takes modifications out of plugins and reduces down to 1 plugin