Merge branch 'hotfix/float_attributes'