updates for ZS 8.0 Beta