[REQ-428] REQ-428