new updates
updates
Merge remote-tracking branch 'vicupstream2/master'