Merge branch 'release-2.4.0' into wip
demo social links
Merge branch 'release-2.4.0'