Initial commit based on vf 3.5 b52