refactor -> remove find operator
Merge branch 'master' into develop