Villagers stuck in Water

Upon backing up a world from 1.14.1 to 1.14.2, I noticed a strange issue with my Village. the Villagers get stuck in the water, we have tried pushing them out but they will just return in the water and spin. Iron golems also appear to have this issue, although they will just remain stationary and spin, or sink into the water.

Unrelated but we have a Farmer that won't change profession despite there being no Composter.