Merge branch 'mh/release-commit-memory-fix'