Migrating to Eclipse 4.39 from 4.38