Client cap release bugfixes

These are the bugfix/testing parts of the wip-9284 feature branch, for giant.