Allow to extend more than one table attributes in the same module
Merge origin/master