Merge remote-tracking branches 'dechamps/sptpsrestart' and 'dechamps/keychanged'...