variableDispatcher
Merged master fixed conflict