Merge branch 'hotfix/add_support_for_attribute' into develop
Added in specific attribute search for name and value to ensure additional attributes are correctly set up
Updated version info
Merge branch 'release/2.3.10.rc2'