Merge branch 'bug/JAL-98consensusMemory' into develop