propagating changes from jsreport core