Merge branch 'hats' into stable-test
Merge branch 'XmasFix' into stable-test