merge from Jlab fork