Everything.me - Dave's waits

Cherry pick of Dave's e.me waits from pull #1031

`master` -> OK
`v1-train` -> Untested