Revert "Revert "Merge branch 'wip/smcv/deprecated-construct-prop' into 'main'""

This reverts commit d41b5bf9.

To be merged after hard code freeze is over. Sorry for the noise.

CC @smcv