improve robot detection and handling
Merge commit 'github/testing' into beta