I’m happy to report that this did the trick! 
I appreciate your took time to look into this, specially on a weekend and given that both stable and SSO are a bit niche, but hopefully it will help others too. Thank you!
I’ll keep an eye for the PR to be merged.