Merge branch 'hotfix/float_attributes' into develop