* Modify ZSS-267 test (for HOUR, MINUTE, SECOND)
Merge remote-tracking branch 'origin/3.0' into 3.0