Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev