re #9604  Fix a bug and make classmaker output rst files for algs
Merge branch 'feature/9604_classmaker_and_rst' into develop