Merge branch 'cpackifw-search-algorithm' into release