STS-673

I applied the patches in STS-673