Merge branch 'jk/fix-attribute-macro-in-2.5'