Rebase to 15971104ed7940884cb70d64dbd508dc6e68f172
docu update
Merge remote-tracking branch 'origin' into HEAD