Merge remote-tracking branch 'upstream/master'
Removal of not needed awaits