Squashed merge of unpublished-link changes