Heri | #2219: Adding Ramya QA feedback