merge changes from jasmin 2