Migrating to Eclipse 4.23 from 4.22