#778 - fix reset issue if paste feature not enabled
Merge remote-tracking branch 'origin/downloads' into downloads
#778 - fix reset issue if paste feature not enabled