presence scheduler
merge dev