r5146 - branches/noflash/cumin