increase wait duration for last handlers to finish
Merge branch 'master' into parallel_updates