update with latest vegas-cmf master