ported features for regression testing
Merge branches 'master' and 'GENIE_2_8_br_JY01' into GENIE_2_8_br_JY01