bunch of fix
Merge remote-tracking branch 'os/master'