Fixes sorting in forms by race table
Merge remote-tracking branch 'origin/master' into dev2