Can't use the `last` statement in do-while block
Merge branch 'support-timeout-in-msec' into merged-pr-1-2