Migrating to Eclipse 4.16 from 4.15