Merge "Ensure ddc is set before start()" into main