Revert "Revert "Support v7""

This reverts commit fb74cd2ce86d42091efd25f2188fba1e45c034cd.