Merge sle 12

Duh, it is not a trivial merge. Anyway, we are porting it forward.