Lots of fixes
Merge remote-tracking branch 'origin'
Test