Only do it if it's a Primo identifier.
Merge remote-tracking branch 'origin/issue-4-primo-refactor' into bootstrap