Merge branch 'develop' into patch/JAL-3088_finalbracenotinrightplace