Fixed a error in the finder system.
Merge remote-tracking branch 'upstream/development' into finderbug