Merge branch 'm-gamma' into s-gamma
Fixed test cases erroring due to choke points
Merge branch 's-gamma' into m-gamma