This branch is a singe commit which is used in wr-switch-sw, where ppsi is a submodule. Let's merge it here to avoid loosing the hash.