BS-9265: use waituntil
Merge branch '6.3.x' into 'MasterBugFixing'