Heri | #3897 | part of feedbacks for ODS group