Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev