updated local changes from cwc-pc
updated local changes from cwc-pc
updated merging issues