TR-063: Update to TR-057