Merge "BUG-86: Fixed echo response processing"