resolved other path finder issue
Merge branch 'origin/develop'