static can be part of m4 macro
oc synch
add numbers of lines changed of CDF5 branch to master
Merge branch 'master' into CDF5