Line Items act as paranoid
Uniqueness validator now accounts for paranoia
Merge remote-tracking branch 'origin/develop' into develop