Merge rc6