Merge with @FlorianDe  from Master -> CreateAllDocs