Merge remote-tracking branch 'origin/pr/2798' into development

* origin/pr/2798:
  Update the crypto submodule
  Use multipart PSA key derivation API