Fix filepicker key
Merge branch 'develop'