JSJaC update from master