Fixes for ZEN-10939