3.7.6
(cherry picked from commit aed9b4adce2f8301469b242e74a9e9dea8a9da66) Co-authored-by: Christopher Fujino <christopherfujino@gmail.com>
(cherry picked from commit aed9b4adce2f8301469b242e74a9e9dea8a9da66) Co-authored-by: Christopher Fujino <christopherfujino@gmail.com>