Added event/get_conditional_acceptance
Merge branch 'sampson'