Merge branch 'bug/JAL-2210_hack_for_Release_2_10' into develop