Updates for 2.3.2 plugin patch

@bhariharan Are these changes okay to go into the `master` plugin?