Merge "Add comment about not changing calendar authority"