Help - Issue with baking - lines/artifacts appearing when baking

Hey all,

Was wondering if someone has come across or knows how to solve these lines that keep appearing on my bakes for AO (and other bakes actually)?

Help much appreciated

It seems the issue is having too long tris/quads (so shorten them using loops, the knife tool, etc.)

Apparently the blender/cycles engine does not like this according to a comment on a previous bug report - https://developer.blender.org/T81710