Merge "Fix lock contention in CAO.binderError handler" into main