Merge branch 'JAL-952_rnahelix' into Release_2_8_1_Branch