Heri | #3897 | second part of feedbacks on ODS group