add openssl cleanup
Merge remote-tracking branch 'origin/dev' into dev
add openssl cleanup