include @jgibson changes into the latest RC2 version of the plugin