Merge tapku changes from ParentLinkMobile master.