3.16.3 patches (rebuild)