Fix insert ID() on add locations.
Merge remote branch 'origin/3819a'