Merge branch 'tb/upgrade-openssl' into devel