nil and blank string
Merge branch 'develop'