optimize afind
Merge branch 'origin/dev-cortex'