Update for new release
merge from distant branch