Fix sandbox flag issue
Bump version
Merge branch 'dev'