Merge conflict solved
Merge branch 'master' of github.com:MoSync/MoSync
Merge remote-tracking branch 'main/master'
Merge branch 'master' into Cordova