Switch vifib to master branch