Merge "DO NOT MERGE Initial STS commit, no test for now becuase K." into lmp-dev