many fixes
Merge remote-tracking branch 'master/master'