Fixed TODO ... saving waypoint has common progress for all
Merge remote-tracking branch 'triakcz/fix_upload_dialog' into upstream
Refactoring: code simplification and naming style
Refactoring: do not use a mutable variable