Merge branch 'bug/JAL-1644_Finder-logic-improvement' into develop