Added sync with 6209
added waitforstart