am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev

* commit '5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
  More migration to Global settings.