- Optimize Entity capabilities a bit by reordering conditions (#9886)