OPS-1213 - Changes for Cloudflare integration

https://work4labs.atlassian.net/browse/OPS-1213

----
WIP

sub-PR of https://github.com/Work4Labs/work4core/pull/71