Updates for merging with master