I think this PR is behind all the delayed SSP stuff, that's not going to be fun. If you need some help, don't hesitate to ask me.