Branch 'tg2merge' - 2 commits - server2/mirrormanager