Cabinet expected to approve revised water policy