manual merge of 'wip' state
renaming '.devtools_globals' to '.devtools_global' (no trailing 's')