Issue #18102:repost changes lost in svn to git migration