Merge branch 'flat_combinig_add_stress_and_unint_tests' of https://github.com/mgalimu...