Merge pull request #4857 from t-nelson/Gotham_13.2_backports