* commit 'ad1f4a2ca825b8524c6bed494a7cf3ca70ee7e28': Implement a max time bound for rotation. (DO NOT MERGE)