Merge gv_support changes r243:251 into the trunk