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