Merge CAPS branch