merge 2.1 <- jsp edition