Protection: Support for custom endpoint
Merge branch 'next-demonic' into next-eve
Merge branch 'next-eve' into eve