Merge CAPS branch

Original commit message from CVS:
Merge CAPS branch
84 files changed