Merge branch 'master' into stable_cpp
Moved more things to WriteCapInfo_cpp. Will need to update TC generation