Migrating to Eclipse 4.22 from 4.21