[Regression]

Regression of commit 3f86f44d634a9b9c56a3904b041673b498e1e948
Also add forgotten documentation of that commit.

Change-Id: I953a15ca8e20f56a9a1171035edf929f66b741af
Signed-off-by: Rolf Theunissen <rolf.theunissen@gmail.com>