Merge "Data Usage, materialized!" into lmp-dev