[ATOM-248]