by more than one period. Added corresponding test cases.

(cherry picked by hand from commit 470fbbe0)