Added new RC version as conflict
Merge with upstream