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