Merge "Fix resource path check when ResourceBasePath is an empty string"