Merge "tools: Fix use of continue"