fixed #268
Merge branch 'bug/268-nas-download-timeout' into dev