Merge "Add FSI view model" into tm-qpr-dev