more fixing
intermediate
Fixed compile issue on 12.10
Merge branch 'master' into peter_dmp_visual