Merge branch 'hs/push-cert-check-cleanup'