display notice only if image upload is enabled
Merge remote-tracking branch 'origin/dev' into dev