fix to test
fix to scenario tests
Merge branch '1.6'