Feature/440 bypass ssp for old api

Fixes #440