Merge Dan/notick gson check into conalsmith-r3 fork

[conalsmith-r3]

👮🏻👮🏻👮🏻 !!!! DESCRIBE YOUR CHANGES HERE !!!! DO NOT FORGET !!!! 👮🏻👮🏻👮🏻

PR Checklist:

• Have you run the unit, integration and smoke tests as described here?
• If you added public APIs, did you write the JavaDocs?
• If the changes are of interest to application developers, have you added them to the changelog (/docs/source/changelog.rst), and potentially the release notes (/docs/source/release-notes.rst)?
• If you are contributing for the first time, please read the contributor agreement now and add a comment to this pull request stating that your PR is in accordance with the Developer's Certificate of Origin.

Thanks for your code, it's appreciated! :)