Merge changes from upstream. Divide each step in tar mission into separate explorations.