Updates from Tibor main branch.