Merge "Refine code for OOF-VFC interaction"