Merge from Tibor main branch.