Datapoint composition
Merge commit 'a554a156064fa3e991ec7160f73c7c1f37fda36e'