Merge "Remove duplicate definitions of utility variables"