Fixed format for nested global properties
Fixed order of compound expansions
Merge branch 'master'; commit 'aa6eb1343183ac67fcbd5ebed6d9222adfdd493d'