Both of the patches in the description were backported to 2.13.8 (the version currently in focal-updates).
Both of the patches in the description were backported to 2.13.8 (the version currently in focal-updates).