Re #8586. Adding support for TOPAS comments.
Merge branch 'feature/8586_save_topas' into develop