Final merge for JEM 2.0.0