Merged with latest version of updatelocationdialog