Xfail contact and fix tap issue

master -> merge
v1-train -> not tested