Patches for 4.1.11 and 3.1.17