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