Migrating to Eclipse 4.37 from 4.36