Docstring fix
Changed setting name for brevity
Merge branch 'feature/custom-storage-classes' into develop