merged from Luca Bruno