Context is changed for following blocks

We use entity_panels to panelize field collections. In our footer we use mini-panel blocks that need the node context.

Problem: Entity_panels changes the context, the new context remains and the mini-panel cannot find a suitable context and disappears.

Solution (?): Preserve context, run the enitity_panel code that modifies the context, then reset the original context. This seems to work for us:

In function entity_panels_entity_view_alter somewhere on top
$current_page = page_manager_get_current_page();
and the before the function closes
page_manager_get_current_page($current_page);