Edit of 3.12.5 on the condor_kbdd.
===GT=== #1813
Merge branch 'V7_8-branch'