Branch 'v1.4' - server/mirrormanager server/update-schema