merge jbx branch