Merge "CTA2075: Fix failing client side tests" into main