Work on rendering related-item and access point link sections
Merge branch 'master' into securesocial-portal-tests