merged last version from HM