Minor fix for CO-416
Additional fix for CO-620
Additional commit for CO-766