TESTING: temporarily remove i23 from testing
Merge remote branch 'remotes/origin/gda-8.42'