Fixes: ZEN-9846, ZEN-9886