[backfire/packages] aiccu: merge r28639