Jaspers changes merged