Merged in the changes from the armT-970328-branch.