Fix up merge of 8.38.
Merge remote-tracking branch 'origin/gda-8.40' into gda-8.42
Fix up merge of 8.40.