Updated plugin to 6.5 branch