[NON-FUNCTIONAL COMMIT] intermediate commit during migration from vaadin 6 to vaadin 7