updates
Merge remote-tracking branch 'origin'
fixed the drop of platforms