Merge branch 'caps_next'