add-jpar0 branch merged