Build: Happy New Year! Thanks @marlonlandaverde

(cherry picked from commit 3118f58c465286d538404669d09026b882b2149e)

Closes gh-1477