am 5e9187a3: Merge "Fix "system" resources; more context user work." into jb-mr1-dev

* commit '5e9187a3cf2a33e559212004795e1278eb60da81':
  Fix "system" resources; more context user work.