Merge remote-tracking branch 'refs/remotes/kali/feature/memoize-calls' into develop