Merge Jessie's changes and fix conflicts