Merge gv tapku changes.