Merge "DO NOT MERGE initial add sts to build" into nyc-dev