Fixed merge issues
Merge branch 'ListviewChanges' into dev-migration