Added get_type method to attribute
Merge branch 'develop-3.3' into master-3.3