Merge "Add documentation for what to use for SS changes" into pi-dev