• Workaround #987 pending a proper fix
  • Further quality tuning