Fix ZEN-10586, ZEN-10587, ZEN-10590