1608 - Integrate class hg with class rietveld