Merge "Adjust VFC modules to latest (Amsterdam)" into release-1.1.0