Fixed a lot of errors
Merge remote-tracking branch 'origin/master' into alcros-dev