Fixing regexes for staticCVR to properly check floating point values.
Manual merge.