Merge branch 'master' into develop
rename namespace bar_data_types into bar_data_type
Merge branch 'develop'