minor bugs
Merge commit 'github/testing' into beta