Merge pull request #18158 from mauri/add_owner

ADD files to a folder doesn't set correct UID and GID