Merge branch 'release/7.x-1.20' into develop
change search url - fix test
version 7.x-1.21
Merge branch 'release/7.x-1.21'