Merge pull request #5642 from hgl/xfrm