Merge branch 'release/7.x-2.20' into develop
ting recommendation is moved to open_adhl
update version
Merge branch 'release/7.x-2.21'