[cleanup] Replace property macros
See merge request !1463 (merged)
(cherry picked from commit c7449b25)
79f0a47a [cleanup] Replace property macros