Merge branch '3098_strip_home'