Merge with master conflict fixes