HoWxCoRe-1598

HoWxCoRe-1598