port jRCU from 3.3 to 3.4