Add org adgenda support
Merge branch 'master' into utcs