Revert "Patch to 3.0.9"

This reverts commit 702827454e5f7a31c2891967b0632c2f9af10049.
Merge branch 'JBX' into TEST
Merge branch 'TEST' into JBX