fixing failing test
Merge branch 'sat-6.0.2-drop7' into sat-6.0.2