PreserveViewData fix
Merge branch 'PreserveViewData'