Merge "Fully-qualify link labels outside current class." into pi-dev