Merge branch 'features/JAL-2379pcaMemory' into develop