Ported over v3.0 fixes to master and extended to master-specific plugins