Automate waiting list handling
Fix for containment issues
Merge remote-tracking branch 'upstream/master'