Merge "Fix: 'Illegal label name'"