Branch 'tg2merge' - server2/mirrormanager