MYHOARD-741 + MYHOARD-739 fixed