Hotfix to remove cert variations
Merge branch 'hotfix/HF_RemoveCertVariations'
Merge branch 'hotfix/HF_RemoveCertVariations' into develop
Merge branch 'release/Release_CertVarHF'
Hotfix tweak to remove cert variations
Merge branch 'release/HotfixCertVars2'