BS-11037: add waituntil condition on the shell