2729: Fix potential error in set_var()
Merge branch 'branch_v2plus_2729' into branch_v2plus