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