Merge "Add exception for inserting files from private directory"