Merge "[SDC] Wait for Message Router before start" into istanbul