Delete wait
Merged from upstream