Make legacy_constructor
rule more reliable
#2102
Merged
legacy_constructor
rule more reliable
#2102