Merge "Add FSI repo" into tm-qpr-dev