fixed the issue
Merge branch 'dev_fixSegmentedView' into development