TESTING: fix initialization of mock object
Merge remote branch 'remotes/origin/8.38' into gda-8.40
Merge remote branch 'remotes/origin/gda-8.40' into gda-8.42