Additional commit for CO-580