more fixes
Merge remote-tracking branch 'origin/testing' into beta