Samples: removed diamond operator (too lot of diffs w/ master, hard to compare branches)
Aligned with master