Merge "Extract subscriber-name only when it is not defined"