[Monica, Andrei] Merge S33 main branch & Fix repo tests.