r5505 - branches/persona/cumin/etc