FORGE-1562: Added wait command