If elementId is empty its probably new so exclude that also
Merge remote-tracking branch 'origin/master' into develop

* origin/master:
  If elementId is empty its probably new so exclude that also