Merge commits from Dec 23 and 24