Merge from luca76