Both of those patches are present in 2.03.11 which was available in 21.04 and backported to 20.04 (see LP: #1929432).
Both of those patches are present in 2.03.11 which was available in 21.04 and backported to 20.04 (see LP: #1929432).