Merge conflict resolution with branch Meteor-1.0