Merge "Fix for GSM-8bit encoding error" into tm-qpr-dev