3.01: merge changes to DID and device billing