add test case
ZSS-528. Sync solution from 2.6.0.FL.20140129.
Merge branch 'zss-528-3.0' for ZSS-528, the solution from 2.6.0.FL.20140129.