Merge branch 'release/7.x-1.25' into develop
feature/1399_link_weight_order
tagging version 7.x-1.26
Merge branch 'release/7.x-1.26'