Migrating to Eclipse 4.13 from 4.12