~40% Speed improvement for MCS generation.
Merge branch 'develop' into coverity-scan