fix update location only issue
Merge remote-tracking branch 'origin/master'