shifting recent PRs to sat-6.0.2
final commit
Merge pull request #605 from ab268/shift-sat-6.0.2

Shift to sat 6.0.2