Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Fix ifdef issue