JBEE-133 - updates to RI b08 sources