[MYHOARD-319] code review update