remove getId() check when determining origin location
Merge remote-tracking branch 'origin/master'