Squashed merge of unpublished-links
Version up to 0.3.9