Definsively program arround LCMAPS issue.  #4397
Merge branch 'V8_0-branch' into V8_2_0-branch