3.16.1 patches applied