KRACOUES-7201: multiple updates from pr comments