Merge-in refactor branch