[otf D]
[otf E]
[otf: D] Merge feature D with develop
[otf: E] Merge feature E with develop

Conflicts:
	README.md
Revert "[otf: D] Merge feature D with develop"

This reverts commit d1b05c5170956d6e0fdea5b4f60e9c2d982788de, reversing
changes made to 74df85d16c129f37a7b2aa29323c517cf175050e.

Conflicts:
	README.md
[otf: D] Fix
Revert "Revert "[otf: D] Merge feature D with develop""

This reverts commit 9c64dee28223bb1559250f9673c7b4d3390b526d.
[otf: D] Merge feature D with develop

Conflicts:
	README.md