let people use this object mapper
Merge branch 'hs_staging' into hs_stable