Merge pull request #8270 from albertopq/issue-835743

Bug 835743 - Only rendering org and social marks markup when it exits(cherry picked from commit 7a411f43bc664a7132ce36a2150d2407cb49226e)