Merge branch 'patch/JAL-2234_renameFER1_ARATH' into develop