Fix for RC1 merging errors