Manual merge of donut-gms cts.mk changes.
1 file changed