Merge "Gesture Error Detection - Improvements Part 3" into main