merge gerrit branch EB classed into the utils project