Merge branch 'feature/track-reverse-proxy-failures' into 'develop'