[finishes #57752846]

Signed-off-by: Mohamad Ahmadi <mhahmadi@nteropcorp.com>