Additional fix for CO-803
Additional fix for CO-766
Fix for commit c88156c447 (CO-766)
Additional fix for CO-766