Merge remote-tracking branch 'refs/remotes/kali/bug/fix-memoized--get-key' into develop