Feat/capi template update2

Created by: garloff

I have cherry-picked the relevant commits from branch feat/capi-template-update into this branch feat/capi-template-update2, so the changes can be meaningfully and efificiently reviewed. I will close PR #254, as this one supercedes it. Reviews welcome!