Migrating to Eclipse 4.18 from 4.17