Add rollover but do not use it yet
Merge pull request #1728 from zz9pzza/issue_4029

Add rollover but do not use it yet