Resources names/values now support strings with spaces. +tests
Merge remote-tracking branch 'origin/tc7' into tc7