Merge branch 'hotfix-2.2.24'
Fixed an issue with an incorrect timestamp comparison for attributes, allowing the update of an attribute with an older version
Merge branch 'hotfix-2.2.25' into develop