Merge remote-tracking branch 'origin/feature/8740-new-signing-key-phase-2' into feature/8740-new-signing-key-phase-2