In addition to upstream commit 42d40581dd919fb134c07027ca1ce0844c670daf, also apply the subsequent fixup commit 603b2c64add5fbf4b7343525cf109af0c7077695. Merge that into the same patch file. Resolves: #2137384
Resolves: #2132326