merge v1-fix: added a way to return a certificate channel

uplift from v1-fix