Migrating to Eclipse 4.38 from 4.37