Merge branch 'jc/push-cert'