[release/8.0] Avoid marking property/event attributes multiple times

[release/8.0] Avoid marking property/event attributes multiple times #3650