Plains and Desert village farm generates without support blocks for water

The bug

Plains and Desert village farms generate without support blocks for the water. When the farm generates above a cave the water is therefore floating (see attached screenshots).

To reproduce (without seed)

1. Execute the following command:

   /place template minecraft:village/plains/houses/plains_large_farm_1
   

2. Notice that water starts flowing downwards, as the structure does not have blocks underneath the water.

How to reproduce (Plains village)

Lasted tested for 21w11a

/execute in minecraft:overworld run tp @s -985.63 61.47 -1016.70 -0.90 -36.15

Last tested for 20w45a

7279329430484538412

/execute in minecraft:overworld run tp @s 31878.68 64.68 -200.62 290.40 -9.30

Outdated seeds and coordinates:

/execute in minecraft:overworld run tp @s -4522.21 59.39 1097236.38 343.20 -20.25

/execute in minecraft:overworld run tp @s -19718.80 62.00 2893368.72 -26.48 -8.25

How to reproduce (Desert village)

Last tested for 20w51a

2497334744588602023

/execute in minecraft:overworld run tp @p 90795 59 -858 120 -30