added source attachment for debug
Merge remote branch 'remotes/origin/gda-8.42'