Merge branch 'fix-sha1-opt-test' into development

* fix-sha1-opt-test:
  Fix issue in testing SHA-1 compile-time option