[sahara][sahara-cores] Combined patch that recovers CI tests