Fixes for ZEN-9846, ZEN-9838, ZEN-9849, ZEN-9884, ZEN-9886, ZEN-9901