SP-48: Pulled in some required changes from the windows/master repo