continue migration to Vaadin 7