#669 - Separate consumption and production for DU reporting