HA-1871 & HA-2071

HA-1871&HA-2071