Revert "Merge branch 'bugid-96110' into dev" to do few changes after code review

This reverts commit 11190371e9c24e872f14467abdf0933509a16436, reversing
changes made to 34d9e424a37940b25599bd8fd5e28a5f311e0eae.