Merge "Do not add starting window after the starting data was cleared." into sc-dev