move changes in utils_gs20140415_rev0416 => utils