merge with cors3 branch differences