Apply manilla 3.16.3 patches