Dina review

Change-Id: Icda33bbaaa52b25a73254c28c82670f09211e8ef