KCINFR-1007: rice upgrade from 2.3.3 to 2.3.5-r45843