Multiple fixes on the maine core of the app
Merge remote-tracking branch 'origin/master'