Sync fork and replace annotations with attributes

What's Changed

• Printedcom develop by @MasterRO94 in #2
• Replace annotations with attributes by @MasterRO94 in #3
• Sync v6.x branch by @MasterRO94 in #4

Full Changelog: 6.0.4...6.1.0