Basic reroll of patch #13 for 2.0.0-beta2 does not address test issues in #14.
This patch was successfully applying to 2.0.0-beta1 but does not apply to 2.0.0-beta2.