fix basenamePrefix
Merge branch 'develop'