Wfk pull 160 2.6.x