Fixes major issue in the optionService
Merge branch 'hotfix'
Updated Version 3.2.007