Fit change in presenters to 2.1 stable branch