Migrating to Eclipse 4.31 from 4.30