[ORECO-344] ORECO-344