Merge pull request #2143 from akoeplinger/refactor-mono-security-providers