docu - do not re-throw
Merge branch 'develop'