Updated for r7205