Attributes cleaned
Merge origin/master