merged wc changes