Merge changes from ParentLinkMobile. Squash.