Merge in RC1