I have a merged PR for this issue in GIT.
I have added a new mapper, "Organization Specific Attribute", which will add the attribute matching claim name, just as the user attribute.