Merge "CSD: Enable CSD dynamically for testing" into main