Fixes for decorators
property deprecations
#50343
+301
−440
Merged