Change-Id: I19780be28912cb0ea1cad49c7c0f43ab3ba8f6e7 Implements: blueprint improve-compute-data-model