add social links to option list
Merge branch 'release-2.4.0'