Fix for manual updates when auto-upate option is enabled.
Merge remote-tracking branch 'origin/dev'