Merge branch 'VAX-TODR'