Merge branch 'Strict-mode-for-VRF'