release-1.24: Backport #5827 and #5850#5853

sunjayBhatia merged 3 commits intoprojectcontour:release-1.24projectcontour/contour:release-1.24from

sunjayBhatia:1.24-req-io-cyclesunjayBhatia/contour:1.24-req-io-cycleCopy head branch name to clipboard