Fixed merge issues

After merging csComp development into master.