Swap implementation since it cause an issue with Orchestra\Widget\WidgetManager.
Merge branch '2.0'