This backports fixes for #19288 (closed) and #19250 (closed) and bumps the version to the release version.