Update from Tibor main branch.