Merge remote-tracking branch 'origin/fix_set_reset_of_location'
fix schema; update Genfile.lock
Fix incorrect search behavior
Resolve merge conflicts