Merge branch 'fix-delete-from_index'
Find method gives error ala "found x, but was expecting y". Where doesn't have this problem.
Merge branch 'master' into 2-2-stable