Several fixes including STS2

Kearns, Aaron (Contractor) M requested to merge test into master Jul 12, 2019