Make location_id nullable
Removed pre-update-cmd
Merge remote-tracking branch 'origin/master' into develop