Bug 914626: [System] missing entities, r=steveck
Merge pull request #12080 from fabi1cazenave/systemMissingEntities-bug914626

Bug 914626: [System] missing entities, r=alive