Migrating to Eclipse 4.17 from 4.16