Fix for if point feature doesn't have a URL set
Merge remote-tracking branch 'origin/develop' into develop