Refactoring.
Merge remote-tracking branch 'origin/gda-8.40'