Merge "Fixes for GSM decoder"