Fix for when relationship is blank
Merge branch 'master' into staging