merge 2.1 <- mobile ultimate edition
Some repairs after merge
Repaired BPM modification