Change-Id: Ic5a9ec189949c0f6f986f3ff4f48266b7548d8e5 partially-implements: blueprint documentation-rework
