Fix rst
Review option part
Merge branch 'feature/fix-helpers' into develop