Comment 15 for bug 1819460

I'll be backporting the non-fill provider mapping part of this to rocky and queens since the code fix and functional tests related to bug 1837955 rely on changes from the series that fixed this bug.