Merge fixes for bleeding