BS-9759: add waituntil of the main shell after the save of diagram