Also, use lookup for global properties
Merge branch 'set-key' into devel