Merge "Implement new rotation policy." into jb-dev