(cherry picked from commit b43cfd3b04e9faf980e319c596be5de49140f9b0)
Commits squashed by Adam Honse <[email protected]>