Merge branch 'dynamic-ssdt' into release