merge 2.1 <- mobile ultimate edition
Some repairs after merge
Repaired BPM modification
Merge remote-tracking branch 'bluesoft-rnd/RELEASE-2.1' into RELEASE-2.1