Merge "Return files-URI for inserts on hidden files" into sc-dev