Switch SP-related extensions to upstream repository