Merge "Fixed Text Quality Regression" into devel/master