Merge branch 'holidays-fixes'