Revert "Merge branch 'hotfix/2.0.2-5' into develop"

This reverts commit f1f1b8a2d4580da44ba2b30467e23fd5a6fca512, reversing
changes made to ff5344e70804d52f626118a08a8ec951be6dcf7c.
update delete data cache logic for not collapsed data
remove extra space