Resync vnfrqts to head of master branch