merge from Vc 0.7 branch fix for icc (#636) plus onother fix (#634)