Merge branch 'feature/JAL-3205symmetricCalc' into develop