Payment dispatcher fixes
Events calendar init commit