[DF-4238] Fix control recursive visibility