Merge commits from Dec 24 and 25