Fixed typo
Corrected options references
Merge branch 'task/PIM-1723' into rip/fixtures
Fixed CS