Merge pull request #4538 from TeamAmaze/happy-new-year