Don't exit wait_for on ACTIVE status if stop_excs are specified
Merge remote-tracking branch 'origin/master'