Closed
Description
The following PRs / Commits all need to land together
#3988 (To be grouped with #4013)
5169311
#4013 (Needs #4215 to fix)
459b106
#4026 (Needs #4215 to fix)
04b1a2f
#4027 (Blocked by #3988
f2e319b
#4100 (blocked by #4026 )
6526ae7
#4118 (blocked by #4100)
46af397
#4215 (Fixed #4013 and #4026)
Most of the work on these were done by @cjihrig and @bnoordhuis
I can attempt to backport these in bulk, but it might be better for someone more familiar with the changes to put together a PR against v4.x-staging with all the above commits rebased and working