Merged filerepo-work branch: