Merge branch 'backport-3.31-custom-transitive-properties' (early part)