Merge branch 'bots' into bots+resources