* fix ZSS-419 issue in ZSS 2.6
  - including ZSS-302 and ZSS-389