updated latest fixes from slc6-icc branch