Field matching dialog, push Uploader/DataWalk to store

#835