Pulling in stratosphere-dist changes from pact4s branch