workaround for crash that otherwise occurs from enumerating attributes on different threads #541
Merge branch 'od/issue_541' into develop