patches to make contrail 1404 compatible