Merge branch 'adhoc'