Merge "CTA2075: Fix possible race condition" into main