Heri | #3897 | part of feedbacks on ODS group