Merged LibT5 changes.