Merge from JSJaC