Merge changes from Tibor