Set is an empty string when unset not undefined.
Merge branch 'fix-issue-73' into development