Merge remote-tracking branch 'upstream/develop' into feat/134-opt-qkd-application-register-new-component
