Fix for values that contain .
Merge branch 'develop'