Merge branch 'release/7.x-0.6' into develop
feature/1399_link_weight_order
feature/1399_link_weight_order
Cleanup
Naming
Merge branch 'feature/1394-orderbtn' into develop
tagging version 7.x-0.7
Merge branch 'release/7.x-0.7'