Revert "Merge branch 'RefactorContextPointer' into 'master'"
This reverts merge request !719 (merged)
719 caused some problems with the scheduling of Views
This reverts merge request !719 (merged)
719 caused some problems with the scheduling of Views