From Rob, refresh all keys during this process
Merge branch 'release/12.0' into release/13.0