Merge "BUG-2227 : fix exporting transitive attributes"