Jacalvo/merge 3.5 in master