Emitters do not work correctly when in node hierarchy

When emitter is part of node hierarchy there are few problems with it. Run the attached example. There are 2 emitters, one in node hierarchy inside particle system and another as a direct child of the system. Only the second one is visible.

Problem 1: The emitter is not registered to the parent system if it is not direct child node of the system. This should work automatically if the emitter is child of the system. The system parameter should only be needed if the emitter is outside the system.

Problem 2: After setting the system, the emitter doesn't follow the node hierarchy, but the particles are emitted from the origin. The particles should be emitted based on the node hierarchy.