merging fix (leaf nodes/conflevel update), embedded policies, services,
fix focus, notifications on internal frame