Merge "Fix for GSM-8bit decoding error"