Pre-merge local version
fixed nullref for missing resources-folder and its contents