Manual merge with "italo" branch