T2h last clean of elements.
Merge remote-tracking branch 'origin/master' into compilation-strings