backport required vinit support from master