fix on finish button
Merge branch 'certificates' into testing