Mostly this is done by #5692, but would be great if we could add some kind of verification to ensure that they are in sync and stay in sync.