SSW fix

Mike Hoang requested to merge mike/SSW into master
Edited by Mike Hoang

Merge request reports