ZSS-528. Sync solution from 2.6.0.FL.20140129.