Merge "Add version to ChronologyProtector key"