Fix
Merge conflict
Fix bgapp to work in dev.