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