fix some warnings, re #9923
Merge branch 'feature/9923_concepts_to_rst' into develop