Updated cap config
Merged into master, fixed conflict