Merge "Temporarily fix for the "telecom" command"