merge w. giulio (master)